Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Mar 2012 06:33:44 +0000 (22:33 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Mar 2012 06:33:44 +0000 (22:33 -0800)
commit605c867189d9a2b8218e498acd8212da7d40ef33
tree97c987a870023df1c17389fb152f3956d2c878ac
parente66ceab6d2eccbce9ab6480e4175383134143924
parent4f686815fe14a7b98a1eb26e1de707c344506656
Merge from trunk.